From 47938ae3f3b0a72d400785188987718f09c07c40 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sat, 17 Jan 2009 19:30:40 +0000 Subject: [PATCH] s/babl_foo_init/babl_foo_class_init/ s/babl_foo_destroy/babl_foo_class_destroy/ s/babl_foo_each/babl_foo_class_for_each/ s/babl_foo/babl_foo_from_name/ s/babl_foo_id/babl_foo_from_id/ * babl/babl-class.h * babl/babl-conversion.c * babl/babl-core.c * babl/babl-fish-path.c * babl/babl-fish-reference.c * babl/babl-fish-stats.c * babl/babl-fish.c * babl/babl-format.c * babl/babl-image.c * babl/babl-internal.h * babl/babl-introspect.c * babl/babl-model.c * babl/babl-sampling.c * babl/babl-sanity.c * babl/babl-type.c * babl/babl.c * babl/base/formats.c * babl/base/model-gray.c * babl/base/model-rgb.c * babl/base/model-ycbcr.c * babl/base/type-float.c * babl/base/type-u16.c * babl/base/type-u32.c * babl/base/type-u8.c * extensions/CIE-Lab.c * extensions/frequency.c * extensions/gegl-fixups.c * extensions/gggl-lies.c * extensions/gggl.c * extensions/gimp-8bit.c * extensions/naive-CMYK.c * extensions/sse-fixups.c * tests/babl-html-dump.c * tests/babl_fish_path_fitness.c * tests/conversions.c * tests/formats.c * tests/grayscale_to_rgb.c * tests/models.c * tests/rgb_to_bgr.c * tests/rgb_to_ycbcr.c * tests/types.c svn path=/trunk/; revision=381 --- ChangeLog | 50 ++++ babl/babl-class.h | 26 +- babl/babl-conversion.c | 24 +- babl/babl-core.c | 32 +-- babl/babl-fish-path.c | 12 +- babl/babl-fish-reference.c | 22 +- babl/babl-fish-stats.c | 6 +- babl/babl-fish.c | 4 +- babl/babl-format.c | 14 +- babl/babl-image.c | 8 +- babl/babl-internal.h | 12 +- babl/babl-introspect.c | 16 +- babl/babl-model.c | 14 +- babl/babl-sampling.c | 10 +- babl/babl-sanity.c | 26 +- babl/babl-type.c | 10 +- babl/babl.c | 32 +-- babl/base/formats.c | 444 ++++++++++++++++----------------- babl/base/model-gray.c | 76 +++--- babl/base/model-rgb.c | 132 +++++----- babl/base/model-ycbcr.c | 78 +++--- babl/base/type-float.c | 8 +- babl/base/type-u16.c | 8 +- babl/base/type-u32.c | 8 +- babl/base/type-u8.c | 24 +- extensions/CIE-Lab.c | 116 ++++----- extensions/frequency.c | 62 ++--- extensions/gegl-fixups.c | 82 +++--- extensions/gggl-lies.c | 218 ++++++++-------- extensions/gggl.c | 218 ++++++++-------- extensions/gimp-8bit.c | 108 ++++---- extensions/naive-CMYK.c | 28 +-- extensions/sse-fixups.c | 34 +-- tests/babl-html-dump.c | 18 +- tests/babl_fish_path_fitness.c | 4 +- tests/conversions.c | 2 +- tests/formats.c | 2 +- tests/grayscale_to_rgb.c | 16 +- tests/models.c | 2 +- tests/rgb_to_bgr.c | 20 +- tests/rgb_to_ycbcr.c | 20 +- tests/types.c | 2 +- 42 files changed, 1049 insertions(+), 999 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c52447..4097ee9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,53 @@ +2009-01-17 Martin Nordholts + + s/babl_foo_init/babl_foo_class_init/ + s/babl_foo_destroy/babl_foo_class_destroy/ + s/babl_foo_each/babl_foo_class_for_each/ + s/babl_foo/babl_foo_from_name/ + s/babl_foo_id/babl_foo_from_id/ + + * babl/babl-class.h + * babl/babl-conversion.c + * babl/babl-core.c + * babl/babl-fish-path.c + * babl/babl-fish-reference.c + * babl/babl-fish-stats.c + * babl/babl-fish.c + * babl/babl-format.c + * babl/babl-image.c + * babl/babl-internal.h + * babl/babl-introspect.c + * babl/babl-model.c + * babl/babl-sampling.c + * babl/babl-sanity.c + * babl/babl-type.c + * babl/babl.c + * babl/base/formats.c + * babl/base/model-gray.c + * babl/base/model-rgb.c + * babl/base/model-ycbcr.c + * babl/base/type-float.c + * babl/base/type-u16.c + * babl/base/type-u32.c + * babl/base/type-u8.c + * extensions/CIE-Lab.c + * extensions/frequency.c + * extensions/gegl-fixups.c + * extensions/gggl-lies.c + * extensions/gggl.c + * extensions/gimp-8bit.c + * extensions/naive-CMYK.c + * extensions/sse-fixups.c + * tests/babl-html-dump.c + * tests/babl_fish_path_fitness.c + * tests/conversions.c + * tests/formats.c + * tests/grayscale_to_rgb.c + * tests/models.c + * tests/rgb_to_bgr.c + * tests/rgb_to_ycbcr.c + * tests/types.c + 2009-01-17 Martin Nordholts * babl/babl-class.h: Remove babl_name() and babl_introspect() diff --git a/babl/babl-class.h b/babl/babl-class.h index cd81ac8..65a0a35 100644 --- a/babl/babl-class.h +++ b/babl/babl-class.h @@ -66,13 +66,13 @@ typedef int (*BablEachFunction) (Babl *entry, * to be iterated over, common functionality is defined through these * macros. */ -#define BABL_CLASS_DECLARE(klass) \ - \ -void babl_##klass##_init (void); \ -void babl_##klass##_destroy (void); \ -Babl * babl_##klass##_id (int id); \ -void babl_##klass##_each (BablEachFunction each_fun, \ - void *user_data) +#define BABL_CLASS_DECLARE(klass) \ + \ +Babl * babl_##klass##_from_id (int id); \ +void babl_##klass##_class_init (void); \ +void babl_##klass##_class_destroy (void); \ +void babl_##klass##_class_for_each (BablEachFunction each_fun, \ + void *user_data) /* creates a class that has a specific name connected to it, that * also allows defining a new instance. These classes share common @@ -80,12 +80,12 @@ void babl_##klass##_each (BablEachFunction each_fun, \ * the means to lookup by name, as well as to create new named objects * that later can be looked up. */ -#define BABL_NAMED_CLASS_DECLARE(klass) \ - \ -BABL_CLASS_DECLARE (klass); \ -Babl * babl_##klass (const char *name); \ -Babl * babl_##klass##_new (void *first_arg, \ - ...) BABL_ARG_NULL_TERMINATED +#define BABL_NAMED_CLASS_DECLARE(klass) \ + \ +BABL_CLASS_DECLARE (klass); \ +Babl * babl_##klass##_from_name (const char *name); \ +Babl * babl_##klass##_new (void *first_arg, \ + ...) BABL_ARG_NULL_TERMINATED /* common header for any item inserted into database, the actual * implementation of babl-instance is in babl-internal diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c index 173cdf3..c633353 100644 --- a/babl/babl-conversion.c +++ b/babl/babl-conversion.c @@ -114,19 +114,19 @@ conversion_new (const char *name, { Babl *src_format = NULL; Babl *dst_format = NULL; - if (BABL (babl->conversion.source) == babl_model_id (BABL_RGBA)) + if (BABL (babl->conversion.source) == babl_model_from_id (BABL_RGBA)) { - src_format = babl_format_id (BABL_RGBA_DOUBLE); + src_format = babl_format_from_id (BABL_RGBA_DOUBLE); dst_format = babl_format_with_model_as_type ( BABL (babl->conversion.destination), - babl_type_id (BABL_DOUBLE)); + babl_type_from_id (BABL_DOUBLE)); } - else if (BABL (babl->conversion.destination) == babl_model_id (BABL_RGBA)) + else if (BABL (babl->conversion.destination) == babl_model_from_id (BABL_RGBA)) { src_format = babl_format_with_model_as_type ( BABL (babl->conversion.source), - babl_type_id (BABL_DOUBLE)); - dst_format = babl_format_id (BABL_RGBA_DOUBLE); + babl_type_from_id (BABL_DOUBLE)); + dst_format = babl_format_from_id (BABL_RGBA_DOUBLE); } else { @@ -450,12 +450,12 @@ babl_conversion_error (BablConversion *conversion) Babl *fmt_source; Babl *fmt_destination; - Babl *fmt_rgba_double = babl_format_new (babl_model ("RGBA"), - babl_type ("double"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + Babl *fmt_rgba_double = babl_format_new (babl_model_from_name ("RGBA"), + babl_type_from_name ("double"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); double error = 0.0; diff --git a/babl/babl-core.c b/babl/babl-core.c index ff734e4..91a59f2 100644 --- a/babl/babl-core.c +++ b/babl/babl-core.c @@ -126,41 +126,41 @@ babl_core_init (void) babl_model_new ( "id", BABL_RGBA, - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( "id", BABL_RGBA_DOUBLE, - babl_model_id (BABL_RGBA), - babl_type_id (BABL_DOUBLE), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_DOUBLE), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); /* babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), "planar", copy_strip_1, NULL ); */ babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_DOUBLE), "plane", convert_double_double, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), "linear", rgba_to_rgba, NULL ); diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c index 038aaaa..29c7bd5 100644 --- a/babl/babl-fish-path.c +++ b/babl/babl-fish-path.c @@ -397,12 +397,12 @@ init_path_instrumentation (Babl *fmt_source, if (!fmt_rgba_double) { fmt_rgba_double = babl_format_new ( - babl_model ("RGBA"), - babl_type ("double"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("double"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); } diff --git a/babl/babl-fish-reference.c b/babl/babl-fish-reference.c index bee30f1..1d9dc73 100644 --- a/babl/babl-fish-reference.c +++ b/babl/babl-fish-reference.c @@ -102,18 +102,18 @@ convert_to_double (BablFormat *source_fmt, BablImage *dst_img; src_img = (BablImage *) babl_image ( - babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL); + babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL); dst_img = (BablImage *) babl_image ( - babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL); + babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL); - dst_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE); + dst_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE); dst_img->pitch[0] = (dst_img->type[0]->bits / 8) * source_fmt->model->components; dst_img->stride[0] = 0; src_img->data[0] = source_buf; - src_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE); + src_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE); src_img->pitch[0] = source_fmt->bytes_per_pixel; src_img->stride[0] = 0; @@ -159,16 +159,16 @@ convert_from_double (BablFormat *destination_fmt, BablImage *dst_img; src_img = (BablImage *) babl_image ( - babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL); + babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL); dst_img = (BablImage *) babl_image ( - babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL); + babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL); - src_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE); + src_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE); src_img->pitch[0] = (src_img->type[0]->bits / 8) * destination_fmt->model->components; src_img->stride[0] = 0; dst_img->data[0] = destination_buf; - dst_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE); + dst_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE); dst_img->pitch[0] = destination_fmt->bytes_per_pixel; dst_img->stride[0] = 0; @@ -272,7 +272,7 @@ babl_fish_reference_process (Babl *babl, source_image = babl_image_from_linear ( source_double_buf, BABL (BABL ((babl->fish.source))->format.model)); rgba_image = babl_image_from_linear ( - rgba_double_buf, babl_model_id (BABL_RGBA)); + rgba_double_buf, babl_model_from_id (BABL_RGBA)); destination_image = babl_image_from_linear ( destination_double_buf, BABL (BABL ((babl->fish.destination))->format.model)); @@ -288,7 +288,7 @@ babl_fish_reference_process (Babl *babl, Babl *conv = assert_conversion_find ( BABL (babl->fish.source)->format.model, - babl_model_id (BABL_RGBA) + babl_model_from_id (BABL_RGBA) ); if (conv->class_type == BABL_CONVERSION_PLANAR) { @@ -310,7 +310,7 @@ babl_fish_reference_process (Babl *babl, { Babl *conv = assert_conversion_find ( - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), BABL (babl->fish.destination)->format.model); if (conv->class_type == BABL_CONVERSION_PLANAR) { diff --git a/babl/babl-fish-stats.c b/babl/babl-fish-stats.c index d9fa9ba..efae3d4 100644 --- a/babl/babl-fish-stats.c +++ b/babl/babl-fish-stats.c @@ -196,7 +196,7 @@ table_source_each (Babl *babl, } fprintf (output_file, ""); - babl_format_each (table_destination_each, babl); + babl_format_class_for_each (table_destination_each, babl); fprintf (output_file, "\n"); source_no++; return 0; @@ -252,7 +252,7 @@ static void conversions (void) { fprintf (output_file, "

Conversions

\n"); - babl_conversion_each (each_conv, NULL); + babl_conversion_class_for_each (each_conv, NULL); fprintf (output_file, "
\n"); } @@ -380,7 +380,7 @@ babl_fish_stats (FILE *file) fprintf (output_file, "\n"); - babl_format_each (table_source_each, NULL); + babl_format_class_for_each (table_source_each, NULL); fprintf (output_file, "
Source formatDestination formats
"); diff --git a/babl/babl-fish.c b/babl/babl-fish.c index a7b5cf7..3052377 100644 --- a/babl/babl-fish.c +++ b/babl/babl-fish.c @@ -165,7 +165,7 @@ babl_fish (const void *source, source_format = source; if (!source_format) - source_format = babl_format ((char *) source); + source_format = babl_format_from_name ((char *) source); if (!source_format) { @@ -177,7 +177,7 @@ babl_fish (const void *source, destination_format = destination; if (!destination_format) - destination_format = babl_format ((char *) destination); + destination_format = babl_format_from_name ((char *) destination); if (!destination_format) { diff --git a/babl/babl-format.c b/babl/babl-format.c index 2696dd0..24af1fa 100644 --- a/babl/babl-format.c +++ b/babl/babl-format.c @@ -194,7 +194,7 @@ babl_format_new (void *first_arg, BablType *type [BABL_MAX_COMPONENTS]; BablSampling *current_sampling = (BablSampling *) babl_sampling (1, 1); - BablType *current_type = (BablType *) babl_type_id (BABL_DOUBLE); + BablType *current_type = (BablType *) babl_type_from_id (BABL_DOUBLE); char *name = NULL; void *arg = first_arg; @@ -393,12 +393,12 @@ babl_format_loss (Babl *babl) Babl *fish_from; ref_fmt = babl_format_new ( - babl_model ("RGBA"), - babl_type ("double"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("double"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); if (babl->format.loss != -1.0) diff --git a/babl/babl-image.c b/babl/babl-image.c index 9d9b9d3..7e58066 100644 --- a/babl/babl-image.c +++ b/babl/babl-image.c @@ -135,7 +135,7 @@ babl_image_from_linear (char *buffer, for (i = 0; i < components; i++) { sampling[i] = (BablSampling *) babl_sampling (1, 1); - type[i] = (BablType *) babl_type_id (BABL_DOUBLE); + type[i] = (BablType *) babl_type_from_id (BABL_DOUBLE); pitch[i] = calc_pitch; stride[i] = 0; data[i] = buffer + offset; @@ -198,7 +198,7 @@ babl_image (void *first, } else { - new_component = (BablComponent *) babl_component (arg); + new_component = (BablComponent *) babl_component_from_name (arg); } /* FIXME: add error checking */ @@ -226,13 +226,13 @@ babl_image (void *first, } void -babl_image_destroy (void) +babl_image_class_destroy (void) { /* nothing to do */ } void -babl_image_init (void) +babl_image_class_init (void) { /* nothing to do */ } diff --git a/babl/babl-internal.h b/babl/babl-internal.h index 86932a8..17cb8cf 100644 --- a/babl/babl-internal.h +++ b/babl/babl-internal.h @@ -211,7 +211,7 @@ void babl_internal_destroy (void); #define BABL_CLASS_MINIMAL_IMPLEMENT(klass) \ void \ -babl_##klass##_init (void) \ +babl_##klass##_class_init (void) \ { \ BABL_PRE_INIT_HOOK; \ if (!db) \ @@ -220,7 +220,7 @@ babl_##klass##_init (void) \ } \ \ void \ -babl_##klass##_destroy (void) \ +babl_##klass##_class_destroy (void) \ { \ BABL_DESTROY_PRE_HOOK; \ babl_db_each (db,each_babl_##klass##_destroy, NULL); \ @@ -229,8 +229,8 @@ babl_##klass##_destroy (void) \ } \ \ void \ -babl_##klass##_each (BablEachFunction each_fun, \ - void *user_data) \ +babl_##klass##_class_for_each (BablEachFunction each_fun, \ + void *user_data) \ { \ babl_db_each (db, each_fun, user_data); \ } \ @@ -239,7 +239,7 @@ babl_##klass##_each (BablEachFunction each_fun, \ BABL_CLASS_MINIMAL_IMPLEMENT(klass) \ \ Babl * \ -babl_##klass (const char *name) \ +babl_##klass##_from_name (const char *name) \ { \ Babl *babl; \ \ @@ -257,7 +257,7 @@ babl_##klass (const char *name) \ } \ \ Babl * \ -babl_##klass##_id (int id) \ +babl_##klass##_from_id (int id) \ { \ Babl *babl; \ babl = babl_db_exist_by_id (db, id); \ diff --git a/babl/babl-introspect.c b/babl/babl-introspect.c index 9db8bb2..20adb56 100644 --- a/babl/babl-introspect.c +++ b/babl/babl-introspect.c @@ -49,28 +49,28 @@ babl_introspect (Babl *babl) babl_log (""); babl_log ("Data Types:"); - babl_type_each (each_introspect, NULL); + babl_type_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("Sampling (chroma subsampling) factors:"); - babl_sampling_each (each_introspect, NULL); + babl_sampling_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("Components:"); - babl_component_each (each_introspect, NULL); + babl_component_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("Models (of components):"); - babl_model_each (each_introspect, NULL); + babl_model_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("Pixel formats:"); - babl_format_each (each_introspect, NULL); + babl_format_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("conversions:"); - babl_conversion_each (each_introspect, NULL); + babl_conversion_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("extensions:"); - babl_extension_each (each_introspect, NULL); + babl_extension_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("fishes"); - babl_fish_each (each_introspect, NULL); + babl_fish_class_for_each (each_introspect, NULL); babl_log (""); babl_set_extender (extender_backup); diff --git a/babl/babl-model.c b/babl/babl-model.c index e7e59ca..7b61229 100644 --- a/babl/babl-model.c +++ b/babl/babl-model.c @@ -209,12 +209,12 @@ static Babl *reference_format (void) if (!self) self = babl_format_new ( - babl_model ("RGBA"), - babl_type ("double"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("double"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); return self; } @@ -226,7 +226,7 @@ static Babl *construct_double_format (Babl *model) int i; argument[args++] = model; - argument[args++] = babl_type ("double"); + argument[args++] = babl_type_from_name ("double"); for (i = 0; i < model->model.components; i++) { diff --git a/babl/babl-sampling.c b/babl/babl-sampling.c index 3f73142..2698f8f 100644 --- a/babl/babl-sampling.c +++ b/babl/babl-sampling.c @@ -52,8 +52,8 @@ each_babl_sampling_destroy (Babl *babl, } void -babl_sampling_each (BablEachFunction each_fun, - void *user_data) +babl_sampling_class_for_each (BablEachFunction each_fun, + void *user_data) { int horizontal; int vertical; @@ -69,13 +69,13 @@ babl_sampling_each (BablEachFunction each_fun, void -babl_sampling_destroy (void) +babl_sampling_class_destroy (void) { - babl_sampling_each (each_babl_sampling_destroy, NULL); + babl_sampling_class_for_each (each_babl_sampling_destroy, NULL); } void -babl_sampling_init (void) +babl_sampling_class_init (void) { int horizontal; int vertical; diff --git a/babl/babl-sanity.c b/babl/babl-sanity.c index 7d5058f..5f9e8ee 100644 --- a/babl/babl-sanity.c +++ b/babl/babl-sanity.c @@ -45,7 +45,7 @@ type_sanity (Babl *babl, { for (i = 0; i < babl_list_size (list); i++) { - if (babl_conversion_destination ((Babl *) list->items[i]) == babl_type_id (BABL_DOUBLE)) + if (babl_conversion_destination ((Babl *) list->items[i]) == babl_type_from_id (BABL_DOUBLE)) { ok = 1; break; @@ -78,7 +78,7 @@ model_sanity (Babl *babl, { for (i = 0; i < babl_list_size (list); i++) { - if (babl_conversion_destination ((Babl *) list->items[i]) == babl_model_id (BABL_RGBA)) + if (babl_conversion_destination ((Babl *) list->items[i]) == babl_model_from_id (BABL_RGBA)) { ok = 1; break; @@ -115,17 +115,17 @@ babl_sanity (void) { OK=1; - babl_type_each (id_sanity, NULL); - babl_component_each (id_sanity, NULL); - babl_model_each (id_sanity, NULL); - babl_format_each (id_sanity, NULL); - - babl_type_each (type_sanity, NULL); - babl_sampling_each (foo, NULL); - babl_component_each (foo, NULL); - babl_model_each (model_sanity, NULL); - babl_format_each (foo, NULL); - babl_conversion_each (foo, NULL); + babl_type_class_for_each (id_sanity, NULL); + babl_component_class_for_each (id_sanity, NULL); + babl_model_class_for_each (id_sanity, NULL); + babl_format_class_for_each (id_sanity, NULL); + + babl_type_class_for_each (type_sanity, NULL); + babl_sampling_class_for_each (foo, NULL); + babl_component_class_for_each (foo, NULL); + babl_model_class_for_each (model_sanity, NULL); + babl_format_class_for_each (foo, NULL); + babl_conversion_class_for_each (foo, NULL); return OK; } diff --git a/babl/babl-type.c b/babl/babl-type.c index a1537ac..fdad51f 100644 --- a/babl/babl-type.c +++ b/babl/babl-type.c @@ -182,9 +182,9 @@ static Babl *double_vector_format (void) if (!self) self = babl_format_new ( - babl_model ("Y"), - babl_type ("double"), - babl_component ("Y"), + babl_model_from_name ("Y"), + babl_type_from_name ("double"), + babl_component_from_name ("Y"), NULL); return self; } @@ -206,9 +206,9 @@ babl_type_is_symmetric (Babl *babl) test_init (0.0, 182.0); ref_fmt = double_vector_format (); - fmt = babl_format_new (babl_model ("Y"), + fmt = babl_format_new (babl_model_from_name ("Y"), babl, - babl_component ("Y"), + babl_component_from_name ("Y"), NULL); fish_to = babl_fish_reference (ref_fmt, fmt); fish_from = babl_fish_reference (fmt, ref_fmt); diff --git a/babl/babl.c b/babl/babl.c index 97ec6fc..a64a7ee 100644 --- a/babl/babl.c +++ b/babl/babl.c @@ -28,19 +28,19 @@ babl_init (void) if (ref_count++ == 0) { babl_internal_init (); - babl_type_init (); - babl_sampling_init (); - babl_component_init (); - babl_model_init (); - babl_format_init (); - babl_conversion_init (); + babl_type_class_init (); + babl_sampling_class_init (); + babl_component_class_init (); + babl_model_class_init (); + babl_format_class_init (); + babl_conversion_class_init (); babl_core_init (); babl_sanity (); babl_extension_base (); babl_sanity (); - babl_extension_init (); + babl_extension_class_init (); babl_sanity (); - babl_fish_init (); + babl_fish_class_init (); babl_sanity (); } } @@ -62,14 +62,14 @@ babl_destroy (void) } } - babl_extension_destroy (); - babl_fish_destroy (); - babl_conversion_destroy (); - babl_format_destroy (); - babl_model_destroy (); - babl_component_destroy (); - babl_sampling_destroy (); - babl_type_destroy (); + babl_extension_class_destroy (); + babl_fish_class_destroy (); + babl_conversion_class_destroy (); + babl_format_class_destroy (); + babl_model_class_destroy (); + babl_component_class_destroy (); + babl_sampling_class_destroy (); + babl_type_class_destroy (); babl_internal_destroy (); babl_memory_sanity (); } diff --git a/babl/base/formats.c b/babl/base/formats.c index ebacd66..a72d9f3 100644 --- a/babl/base/formats.c +++ b/babl/base/formats.c @@ -26,286 +26,286 @@ void babl_formats_init (void) { babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_DOUBLE), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_DOUBLE), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_format_new ( - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_format_new ( - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMA_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMA_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMA_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMA_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMA), NULL); babl_format_new ( "name", "Y'CbCr u8", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), NULL); babl_format_new ( - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), NULL); babl_format_new ( - babl_model_id (BABL_YCBCR_ALPHA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_YCBCR_ALPHA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA), - babl_type_id (BABL_DOUBLE), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_DOUBLE), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_PREMULTIPLIED), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED_MUL_ALPHA), - babl_component_id (BABL_GREEN_MUL_ALPHA), - babl_component_id (BABL_BLUE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_PREMULTIPLIED), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED_MUL_ALPHA), - babl_component_id (BABL_GREEN_MUL_ALPHA), - babl_component_id (BABL_BLUE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_PREMULTIPLIED), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_MUL_ALPHA), - babl_component_id (BABL_GREEN_MUL_ALPHA), - babl_component_id (BABL_BLUE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGB), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); babl_format_new ( - babl_model_id (BABL_RGB), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); babl_format_new ( - babl_model_id (BABL_RGB), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMINANCE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMINANCE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMINANCE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMINANCE), + babl_model_from_id (BABL_GRAY), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMINANCE), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMINANCE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMINANCE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMINANCE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMINANCE), + babl_model_from_id (BABL_GRAY), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMINANCE), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMINANCE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMINANCE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMINANCE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMINANCE), + babl_model_from_id (BABL_GRAY), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMINANCE), NULL); /* overriding name, since the generated name would be wrong due @@ -313,28 +313,28 @@ babl_formats_init (void) */ babl_format_new ( "name", "Y'CbCr u8", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - NULL); - babl_format_new ( - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - NULL); - babl_format_new ( - babl_model_id (BABL_YCBCR_ALPHA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + NULL); + babl_format_new ( + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + NULL); + babl_format_new ( + babl_model_from_id (BABL_YCBCR_ALPHA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + babl_component_from_id (BABL_ALPHA), NULL); } diff --git a/babl/base/model-gray.c b/babl/base/model-gray.c index 1a99930..1684879 100644 --- a/babl/base/model-gray.c +++ b/babl/base/model-gray.c @@ -69,38 +69,38 @@ models (void) { babl_model_new ( "id", BABL_GRAY, - babl_component_id (BABL_LUMINANCE), + babl_component_from_id (BABL_LUMINANCE), NULL); babl_model_new ( "id", BABL_GRAY_ALPHA, - babl_component_id (BABL_LUMINANCE), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMINANCE), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_GRAY_ALPHA_PREMULTIPLIED, - babl_component_id (BABL_LUMINANCE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_GRAY_GAMMA_2_2, - babl_component_id (BABL_LUMA), + babl_component_from_id (BABL_LUMA), NULL); babl_model_new ( "id", BABL_GRAY_GAMMA_2_2_ALPHA, - babl_component_id (BABL_LUMA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED, - babl_component_id (BABL_LUMA_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMA_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); } @@ -486,100 +486,100 @@ static void conversions (void) { babl_conversion_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), "planar", gray_2_2_to_rgb, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), "planar", rgb_to_gray_2_2, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_model_from_id (BABL_RGBA), "planar", gray_2_2_to_rgb, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), "planar", rgb_to_gray_2_2, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), "linear", gray_gamma_2_2_premultiplied2rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), "linear", rgba2gray_gamma_2_2_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY), + babl_model_from_id (BABL_RGBA), "linear", gray_to_rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_model_from_id (BABL_RGBA), "linear", graya_to_rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_ALPHA), "linear", rgba_to_graya, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY), "linear", rgba_to_gray, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), "planar", non_premultiplied_to_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_model_id (BABL_GRAY_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_GRAY_ALPHA), "planar", premultiplied_to_non_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), "planar", gray_alpha_premultiplied_to_rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), "planar", rgba_to_gray_alpha_premultiplied, NULL ); diff --git a/babl/base/model-rgb.c b/babl/base/model-rgb.c index 2da6552..4edbea7 100644 --- a/babl/base/model-rgb.c +++ b/babl/base/model-rgb.c @@ -111,40 +111,40 @@ models (void) { babl_model_new ( "id", BABL_RGB, - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); babl_model_new ( "id", BABL_RGBA_PREMULTIPLIED, - babl_component_id (BABL_RED_MUL_ALPHA), - babl_component_id (BABL_GREEN_MUL_ALPHA), - babl_component_id (BABL_BLUE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_RED_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_RGB_GAMMA_2_2, - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_model_new ( "id", BABL_RGBA_GAMMA_2_2, - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_RGBA_GAMMA_2_2_PREMULTIPLIED, - babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); } @@ -401,73 +401,73 @@ static void conversions (void) { babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), "planar", copy_strip_1, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGB), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGB), + babl_model_from_id (BABL_RGBA), "planar", copy_strip_1, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGB), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGB), "planar", copy_strip_1, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), "planar", non_premultiplied_to_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA_PREMULTIPLIED), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), "planar", premultiplied_to_non_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGB_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGB_GAMMA_2_2), "planar", g3_gamma_2_2, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), "planar", g3_inv_gamma_2_2, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), "linear", rgba2rgba_gamma_2_2, NULL); babl_conversion_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), "linear", rgba_gamma_2_22rgba, NULL); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), "linear", rgba2rgba_gamma_2_2_premultiplied, NULL); babl_conversion_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), "linear", rgba_gamma_2_2_premultiplied2rgba, NULL); } @@ -478,49 +478,49 @@ formats (void) babl_format_new ( //"name", "srgb", "id", BABL_SRGB, - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_format_new ( "id", BABL_SRGBA, - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( "id", BABL_RGBA_FLOAT, - babl_model_id (BABL_RGBA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( "id", BABL_RGB_FLOAT, - babl_model_id (BABL_RGB), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); #ifdef XXXX babl_format_new ( "id", BABL_RGB565, - babl_model_id (BABL_RGB), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), ); #endif diff --git a/babl/base/model-ycbcr.c b/babl/base/model-ycbcr.c index 10551a7..ba3d706 100644 --- a/babl/base/model-ycbcr.c +++ b/babl/base/model-ycbcr.c @@ -60,17 +60,17 @@ models (void) { babl_model_new ( "id", BABL_YCBCR, - babl_component_id (BABL_LUMA), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), NULL); babl_model_new ( "id", BABL_YCBCR_ALPHA, - babl_component_id (BABL_LUMA), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + babl_component_from_id (BABL_ALPHA), NULL); } @@ -209,26 +209,26 @@ static void conversions (void) { babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_YCBCR), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_YCBCR), "linear", rgba_to_ycbcr, NULL ); babl_conversion_new ( - babl_model_id (BABL_YCBCR), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_YCBCR), + babl_model_from_id (BABL_RGBA), "linear", ycbcr_to_rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_YCBCR_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_YCBCR_ALPHA), "linear", rgba_to_ycbcra, NULL ); babl_conversion_new ( - babl_model_id (BABL_YCBCR_ALPHA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_YCBCR_ALPHA), + babl_model_from_id (BABL_RGBA), "linear", ycbcra_to_rgba, NULL ); @@ -241,15 +241,15 @@ formats (void) "name", "Y'CbCr u8", "id", BABL_YCBCR420, "planar", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), babl_sampling (1, 1), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), babl_sampling (2, 2), - babl_component_id (BABL_CB), + babl_component_from_id (BABL_CB), babl_sampling (2, 2), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_CR), NULL); return; @@ -257,15 +257,15 @@ formats (void) "name", "y'cbcr420", "id", BABL_YCBCR420, "planar", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), babl_sampling (1, 1), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), babl_sampling (2, 2), - babl_component_id (BABL_CB), + babl_component_from_id (BABL_CB), babl_sampling (2, 2), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_CR), NULL); @@ -273,29 +273,29 @@ formats (void) "name", "y'cbcr422", "id", BABL_YCBCR422, "planar", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), babl_sampling (1, 1), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), babl_sampling (2, 1), - babl_component_id (BABL_CB), + babl_component_from_id (BABL_CB), babl_sampling (2, 1), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_CR), NULL); babl_format_new ( "name", "y'cbcr411", "id", BABL_YCBCR411, "planar", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), babl_sampling (1, 1), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), babl_sampling (4, 1), - babl_component_id (BABL_CB), + babl_component_from_id (BABL_CB), babl_sampling (4, 1), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_CR), NULL); } diff --git a/babl/base/type-float.c b/babl/base/type-float.c index 25b882d..c358b16 100644 --- a/babl/base/type-float.c +++ b/babl/base/type-float.c @@ -65,15 +65,15 @@ babl_base_type_float (void) NULL); babl_conversion_new ( - babl_type_id (BABL_FLOAT), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_FLOAT), + babl_type_from_id (BABL_DOUBLE), "plane", convert_float_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_FLOAT), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_FLOAT), "plane", convert_double_float, NULL ); diff --git a/babl/base/type-u16.c b/babl/base/type-u16.c index bbb548f..1ff4bc2 100644 --- a/babl/base/type-u16.c +++ b/babl/base/type-u16.c @@ -119,15 +119,15 @@ babl_base_type_u16 (void) NULL); babl_conversion_new ( - babl_type_id (BABL_U16), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U16), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u16_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U16), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U16), "plane", convert_double_u16, NULL ); diff --git a/babl/base/type-u32.c b/babl/base/type-u32.c index cb1854a..f62d043 100644 --- a/babl/base/type-u32.c +++ b/babl/base/type-u32.c @@ -118,15 +118,15 @@ babl_base_type_u32 (void) NULL); babl_conversion_new ( - babl_type_id (BABL_U32), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U32), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u32_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U32), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U32), "plane", convert_double_u32, NULL ); diff --git a/babl/base/type-u8.c b/babl/base/type-u8.c index 592258f..29bd896 100644 --- a/babl/base/type-u8.c +++ b/babl/base/type-u8.c @@ -140,38 +140,38 @@ babl_base_type_u8 (void) NULL ); babl_conversion_new ( - babl_type_id (BABL_U8), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u8_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U8), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8), "plane", convert_double_u8, NULL ); babl_conversion_new ( - babl_type_id (BABL_U8_LUMA), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8_LUMA), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u8_luma_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U8_LUMA), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8_LUMA), "plane", convert_double_u8_luma, NULL ); babl_conversion_new ( - babl_type_id (BABL_U8_CHROMA), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8_CHROMA), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u8_chroma_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U8_CHROMA), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8_CHROMA), "plane", convert_double_u8_chroma, NULL ); diff --git a/extensions/CIE-Lab.c b/extensions/CIE-Lab.c index 47cbbd5..2865a4b 100644 --- a/extensions/CIE-Lab.c +++ b/extensions/CIE-Lab.c @@ -55,17 +55,17 @@ models (void) { babl_model_new ( "name", "CIE Lab", - babl_component ("CIE L"), - babl_component ("CIE a"), - babl_component ("CIE b"), + babl_component_from_name ("CIE L"), + babl_component_from_name ("CIE a"), + babl_component_from_name ("CIE b"), NULL); babl_model_new ( "name", "CIE Lab alpha", - babl_component ("CIE L"), - babl_component ("CIE a"), - babl_component ("CIE b"), - babl_component ("A"), + babl_component_from_name ("CIE L"), + babl_component_from_name ("CIE a"), + babl_component_from_name ("CIE b"), + babl_component_from_name ("A"), NULL); } @@ -232,26 +232,26 @@ static void conversions (void) { babl_conversion_new ( - babl_model ("RGBA"), - babl_model ("CIE Lab"), + babl_model_from_name ("RGBA"), + babl_model_from_name ("CIE Lab"), "linear", rgba_to_lab, NULL ); babl_conversion_new ( - babl_model ("CIE Lab"), - babl_model ("RGBA"), + babl_model_from_name ("CIE Lab"), + babl_model_from_name ("RGBA"), "linear", lab_to_rgba, NULL ); babl_conversion_new ( - babl_model ("RGBA"), - babl_model ("CIE Lab alpha"), + babl_model_from_name ("RGBA"), + babl_model_from_name ("CIE Lab alpha"), "linear", rgba_to_laba, NULL ); babl_conversion_new ( - babl_model ("CIE Lab alpha"), - babl_model ("RGBA"), + babl_model_from_name ("CIE Lab alpha"), + babl_model_from_name ("RGBA"), "linear", laba_to_rgba, NULL ); @@ -264,47 +264,47 @@ formats (void) { babl_format_new ( "name", "CIE Lab float", - babl_model ("CIE Lab"), + babl_model_from_name ("CIE Lab"), - babl_type ("float"), - babl_component ("CIE L"), - babl_component ("CIE a"), - babl_component ("CIE b"), + babl_type_from_name ("float"), + babl_component_from_name ("CIE L"), + babl_component_from_name ("CIE a"), + babl_component_from_name ("CIE b"), NULL); babl_format_new ( "name", "CIE Lab alpha float", - babl_model ("CIE Lab alpha"), + babl_model_from_name ("CIE Lab alpha"), - babl_type ("double"), - babl_component ("CIE L"), - babl_component ("CIE a"), - babl_component ("CIE b"), - babl_component ("A"), + babl_type_from_name ("double"), + babl_component_from_name ("CIE L"), + babl_component_from_name ("CIE a"), + babl_component_from_name ("CIE b"), + babl_component_from_name ("A"), NULL); babl_format_new ( "name", "CIE Lab u8", - babl_model ("CIE Lab"), - - babl_type ("CIE u8 L"), - babl_component ("CIE L"), - babl_type ("CIE u8 ab"), - babl_component ("CIE a"), - babl_type ("CIE u8 ab"), - babl_component ("CIE b"), + babl_model_from_name ("CIE Lab"), + + babl_type_from_name ("CIE u8 L"), + babl_component_from_name ("CIE L"), + babl_type_from_name ("CIE u8 ab"), + babl_component_from_name ("CIE a"), + babl_type_from_name ("CIE u8 ab"), + babl_component_from_name ("CIE b"), NULL); babl_format_new ( "name", "CIE Lab u16", - babl_model ("CIE Lab"), - - babl_type ("CIE u16 L"), - babl_component ("CIE L"), - babl_type ("CIE u16 ab"), - babl_component ("CIE a"), - babl_type ("CIE u16 ab"), - babl_component ("CIE b"), + babl_model_from_name ("CIE Lab"), + + babl_type_from_name ("CIE u16 L"), + babl_component_from_name ("CIE L"), + babl_type_from_name ("CIE u16 ab"), + babl_component_from_name ("CIE a"), + babl_type_from_name ("CIE u16 ab"), + babl_component_from_name ("CIE b"), NULL); } @@ -423,27 +423,27 @@ types_u8 (void) ); babl_conversion_new ( - babl_type ("CIE u8 L"), - babl_type ("double"), + babl_type_from_name ("CIE u8 L"), + babl_type_from_name ("double"), "plane", convert_u8_l_double, NULL ); babl_conversion_new ( - babl_type ("double"), - babl_type ("CIE u8 L"), + babl_type_from_name ("double"), + babl_type_from_name ("CIE u8 L"), "plane", convert_double_u8_l, NULL ); babl_conversion_new ( - babl_type ("CIE u8 ab"), - babl_type ("double"), + babl_type_from_name ("CIE u8 ab"), + babl_type_from_name ("double"), "plane", convert_u8_ab_double, NULL ); babl_conversion_new ( - babl_type ("double"), - babl_type ("CIE u8 ab"), + babl_type_from_name ("double"), + babl_type_from_name ("CIE u8 ab"), "plane", convert_double_u8_ab, NULL ); @@ -562,27 +562,27 @@ types_u16 (void) babl_conversion_new ( - babl_type ("CIE u16 L"), - babl_type ("double"), + babl_type_from_name ("CIE u16 L"), + babl_type_from_name ("double"), "plane", convert_u16_l_double, NULL ); babl_conversion_new ( - babl_type ("double"), - babl_type ("CIE u16 L"), + babl_type_from_name ("double"), + babl_type_from_name ("CIE u16 L"), "plane", convert_double_u16_l, NULL ); babl_conversion_new ( - babl_type ("CIE u16 ab"), - babl_type ("double"), + babl_type_from_name ("CIE u16 ab"), + babl_type_from_name ("double"), "plane", convert_u16_ab_double, NULL ); babl_conversion_new ( - babl_type ("double"), - babl_type ("CIE u16 ab"), + babl_type_from_name ("double"), + babl_type_from_name ("CIE u16 ab"), "plane", convert_double_u16_ab, NULL ); diff --git a/extensions/frequency.c b/extensions/frequency.c index 90fcf87..2ece2f5 100644 --- a/extensions/frequency.c +++ b/extensions/frequency.c @@ -59,57 +59,57 @@ init (void) babl_model_new ( "name", "frequency", - babl_component ("Rr"), - babl_component ("Gr"), - babl_component ("Br"), - babl_component ("Ar"), - babl_component ("Ri"), - babl_component ("Gi"), - babl_component ("Bi"), - babl_component ("Ai"), + babl_component_from_name ("Rr"), + babl_component_from_name ("Gr"), + babl_component_from_name ("Br"), + babl_component_from_name ("Ar"), + babl_component_from_name ("Ri"), + babl_component_from_name ("Gi"), + babl_component_from_name ("Bi"), + babl_component_from_name ("Ai"), NULL ); babl_conversion_new ( - babl_model ("RGBA"), - babl_model ("frequency"), + babl_model_from_name ("RGBA"), + babl_model_from_name ("frequency"), "linear", rgba_to_frequency, NULL ); babl_conversion_new ( - babl_model ("frequency"), - babl_model ("RGBA"), + babl_model_from_name ("frequency"), + babl_model_from_name ("RGBA"), "linear", frequency_to_rgba, NULL ); babl_format_new ( "name", "frequency float", - babl_model ("frequency"), - babl_component ("Rr"), - babl_component ("Gr"), - babl_component ("Br"), - babl_component ("Ar"), - babl_component ("Ri"), - babl_component ("Gi"), - babl_component ("Bi"), - babl_component ("Ai"), + babl_model_from_name ("frequency"), + babl_component_from_name ("Rr"), + babl_component_from_name ("Gr"), + babl_component_from_name ("Br"), + babl_component_from_name ("Ar"), + babl_component_from_name ("Ri"), + babl_component_from_name ("Gi"), + babl_component_from_name ("Bi"), + babl_component_from_name ("Ai"), NULL ); babl_format_new ( "name", "frequency double", - babl_model ("frequency"), - babl_type ("double"), - babl_component ("Rr"), - babl_component ("Gr"), - babl_component ("Br"), - babl_component ("Ar"), - babl_component ("Ri"), - babl_component ("Gi"), - babl_component ("Bi"), - babl_component ("Ai"), + babl_model_from_name ("frequency"), + babl_type_from_name ("double"), + babl_component_from_name ("Rr"), + babl_component_from_name ("Gr"), + babl_component_from_name ("Br"), + babl_component_from_name ("Ar"), + babl_component_from_name ("Ri"), + babl_component_from_name ("Gi"), + babl_component_from_name ("Bi"), + babl_component_from_name ("Ai"), NULL ); diff --git a/extensions/gegl-fixups.c b/extensions/gegl-fixups.c index df4676a..fec7457 100644 --- a/extensions/gegl-fixups.c +++ b/extensions/gegl-fixups.c @@ -527,63 +527,63 @@ int init (void) { Babl *rgbaF = babl_format_new ( - babl_model ("RGBA"), - babl_type ("float"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("float"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgbAF = babl_format_new ( - babl_model ("RaGaBaA"), - babl_type ("float"), - babl_component ("Ra"), - babl_component ("Ga"), - babl_component ("Ba"), - babl_component ("A"), + babl_model_from_name ("RaGaBaA"), + babl_type_from_name ("float"), + babl_component_from_name ("Ra"), + babl_component_from_name ("Ga"), + babl_component_from_name ("Ba"), + babl_component_from_name ("A"), NULL); Babl *lrgba8 = babl_format_new ( - babl_model ("RGBA"), - babl_type ("u8"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("u8"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgba8 = babl_format_new ( - babl_model ("R'G'B'A"), - babl_type ("u8"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), - babl_component ("A"), + babl_model_from_name ("R'G'B'A"), + babl_type_from_name ("u8"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), + babl_component_from_name ("A"), NULL); Babl *bgrA8 = babl_format_new ( "name", "B'aG'aR'aA u8", - babl_model ("R'aG'aB'aA"), - babl_type ("u8"), - babl_component ("B'a"), - babl_component ("G'a"), - babl_component ("R'a"), - babl_component ("A"), + babl_model_from_name ("R'aG'aB'aA"), + babl_type_from_name ("u8"), + babl_component_from_name ("B'a"), + babl_component_from_name ("G'a"), + babl_component_from_name ("R'a"), + babl_component_from_name ("A"), NULL); Babl *rgb8 = babl_format_new ( - babl_model ("R'G'B'"), - babl_type ("u8"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), + babl_model_from_name ("R'G'B'"), + babl_type_from_name ("u8"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), NULL); Babl *sdl32 = babl_format_new ( "name", "B'aG'aR'aPAD u8", - babl_model ("R'G'B'"), - babl_type ("u8"), - babl_component ("B'"), - babl_component ("G'"), - babl_component ("R'"), - babl_component ("PAD"), + babl_model_from_name ("R'G'B'"), + babl_type_from_name ("u8"), + babl_component_from_name ("B'"), + babl_component_from_name ("G'"), + babl_component_from_name ("R'"), + babl_component_from_name ("PAD"), NULL); table_init (); diff --git a/extensions/gggl-lies.c b/extensions/gggl-lies.c index 0fcfd7b..cdd8856 100644 --- a/extensions/gggl-lies.c +++ b/extensions/gggl-lies.c @@ -1796,158 +1796,158 @@ int init (void) { Babl *rgbaF = babl_format_new ( - babl_model ("RGBA"), - babl_type ("float"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("float"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgba16 = babl_format_new ( - babl_model ("RGBA"), - babl_type ("u16"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("u16"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgbaD = babl_format_new ( - babl_model ("RGBA"), - babl_type ("double"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("double"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgba8 = babl_format_new ( - babl_model ("RGBA"), - babl_type ("u8"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("u8"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgbAF = babl_format_new ( - babl_model ("RaGaBaA"), - babl_type ("float"), - babl_component ("Ra"), - babl_component ("Ga"), - babl_component ("Ba"), - babl_component ("A"), + babl_model_from_name ("RaGaBaA"), + babl_type_from_name ("float"), + babl_component_from_name ("Ra"), + babl_component_from_name ("Ga"), + babl_component_from_name ("Ba"), + babl_component_from_name ("A"), NULL); Babl *rgbA16 = babl_format_new ( - babl_model ("RaGaBaA"), - babl_type ("u16"), - babl_component ("Ra"), - babl_component ("Ga"), - babl_component ("Ba"), - babl_component ("A"), + babl_model_from_name ("RaGaBaA"), + babl_type_from_name ("u16"), + babl_component_from_name ("Ra"), + babl_component_from_name ("Ga"), + babl_component_from_name ("Ba"), + babl_component_from_name ("A"), NULL); Babl *rgbA8 = babl_format_new ( - babl_model ("RaGaBaA"), - babl_type ("u8"), - babl_component ("Ra"), - babl_component ("Ga"), - babl_component ("Ba"), - babl_component ("A"), + babl_model_from_name ("RaGaBaA"), + babl_type_from_name ("u8"), + babl_component_from_name ("Ra"), + babl_component_from_name ("Ga"), + babl_component_from_name ("Ba"), + babl_component_from_name ("A"), NULL); Babl *rgbF = babl_format_new ( - babl_model ("RGB"), - babl_type ("float"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), + babl_model_from_name ("RGB"), + babl_type_from_name ("float"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), NULL); Babl *rgb16 = babl_format_new ( - babl_model ("RGB"), - babl_type ("u16"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), + babl_model_from_name ("RGB"), + babl_type_from_name ("u16"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), NULL); Babl *rgb8 = babl_format_new ( - babl_model ("RGB"), - babl_type ("u8"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), + babl_model_from_name ("RGB"), + babl_type_from_name ("u8"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), NULL); Babl *gaF = babl_format_new ( - babl_model ("YA"), - babl_type ("float"), - babl_component ("Y"), - babl_component ("A"), + babl_model_from_name ("YA"), + babl_type_from_name ("float"), + babl_component_from_name ("Y"), + babl_component_from_name ("A"), NULL); Babl *gAF = babl_format_new ( - babl_model ("YaA"), - babl_type ("float"), - babl_component ("Ya"), - babl_component ("A"), + babl_model_from_name ("YaA"), + babl_type_from_name ("float"), + babl_component_from_name ("Ya"), + babl_component_from_name ("A"), NULL); Babl *gF = babl_format_new ( - babl_model ("Y"), - babl_type ("float"), - babl_component ("Y"), + babl_model_from_name ("Y"), + babl_type_from_name ("float"), + babl_component_from_name ("Y"), NULL); Babl *ga16 = babl_format_new ( - babl_model ("YA"), - babl_type ("u16"), - babl_component ("Y"), - babl_component ("A"), + babl_model_from_name ("YA"), + babl_type_from_name ("u16"), + babl_component_from_name ("Y"), + babl_component_from_name ("A"), NULL); Babl *gA16 = babl_format_new ( - babl_model ("YaA"), - babl_type ("u16"), - babl_component ("Ya"), - babl_component ("A"), + babl_model_from_name ("YaA"), + babl_type_from_name ("u16"), + babl_component_from_name ("Ya"), + babl_component_from_name ("A"), NULL); Babl *g16 = babl_format_new ( - babl_model ("Y"), - babl_type ("u16"), - babl_component ("Y"), + babl_model_from_name ("Y"), + babl_type_from_name ("u16"), + babl_component_from_name ("Y"), NULL); Babl *ga8 = babl_format_new ( - babl_model ("YA"), - babl_type ("u8"), - babl_component ("Y"), - babl_component ("A"), + babl_model_from_name ("YA"), + babl_type_from_name ("u8"), + babl_component_from_name ("Y"), + babl_component_from_name ("A"), NULL); Babl *gA8 = babl_format_new ( - babl_model ("YaA"), - babl_type ("u8"), - babl_component ("Ya"), - babl_component ("A"), + babl_model_from_name ("YaA"), + babl_type_from_name ("u8"), + babl_component_from_name ("Ya"), + babl_component_from_name ("A"), NULL); Babl *g8 = babl_format_new ( - babl_model ("Y"), - babl_type ("u8"), - babl_component ("Y"), + babl_model_from_name ("Y"), + babl_type_from_name ("u8"), + babl_component_from_name ("Y"), NULL); Babl *yuv8 = babl_format_new ( "name", "Y'CbCr u8", - babl_model ("Y'CbCr"), - babl_type ("u8-luma"), - babl_component ("Y'"), - babl_type ("u8-chroma"), - babl_component ("Cb"), - babl_component ("Cr"), + babl_model_from_name ("Y'CbCr"), + babl_type_from_name ("u8-luma"), + babl_component_from_name ("Y'"), + babl_type_from_name ("u8-chroma"), + babl_component_from_name ("Cb"), + babl_component_from_name ("Cr"), NULL); Babl *yuvF = babl_format_new ( - babl_model ("Y'CbCr"), - babl_type ("float"), - babl_component ("Y'"), - babl_type ("float"), - babl_component ("Cb"), - babl_component ("Cr"), + babl_model_from_name ("Y'CbCr"), + babl_type_from_name ("float"), + babl_component_from_name ("Y'"), + babl_type_from_name ("float"), + babl_component_from_name ("Cb"), + babl_component_from_name ("Cr"), NULL); Babl *yuvaF = babl_format_new ( - babl_model ("Y'CbCrA"), - babl_type ("float"), - babl_component ("Y'"), - babl_type ("float"), - babl_component ("Cb"), - babl_component ("Cr"), - babl_component ("A"), + babl_model_from_name ("Y'CbCrA"), + babl_type_from_name ("float"), + babl_component_from_name ("Y'"), + babl_type_from_name ("float"), + babl_component_from_name ("Cb"), + babl_component_from_name ("Cr"), + babl_component_from_name ("A"), NULL); #define o(src, dst) \ diff --git a/extensions/gggl.c b/extensions/gggl.c index e24e51c..2e36c01 100644 --- a/extensions/gggl.c +++ b/extensions/gggl.c @@ -1887,158 +1887,158 @@ int init (void) { Babl *rgbaD = babl_format_new ( - babl_model ("R'G'B'A"), - babl_type ("double"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), - babl_component ("A"), + babl_model_from_name ("R'G'B'A"), + babl_type_from_name ("double"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), + babl_component_from_name ("A"), NULL); Babl *rgbaF = babl_format_new ( - babl_model ("R'G'B'A"), - babl_type ("float"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), - babl_component ("A"), + babl_model_from_name ("R'G'B'A"), + babl_type_from_name ("float"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), + babl_component_from_name ("A"), NULL); Babl *rgba16 = babl_format_new ( - babl_model ("R'G'B'A"), - babl_type ("u16"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), - babl_component ("A"), + babl_model_from_name ("R'G'B'A"), + babl_type_from_name ("u16"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), + babl_component_from_name ("A"), NULL); Babl *rgba8 = babl_format_new ( - babl_model ("R'G'B'A"), - babl_type ("u8"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), - babl_component ("A"), + babl_model_from_name ("R'G'B'A"), + babl_type_from_name ("u8"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), + babl_component_from_name ("A"), NULL); Babl *rgbAF = babl_format_new ( - babl_model ("R'aG'aB'aA"), - babl_type ("float"), - babl_component ("R'a"), - babl_component ("G'a"), - babl_component ("B'a"), - babl_component ("A"), + babl_model_from_name ("R'aG'aB'aA"), + babl_type_from_name ("float"), + babl_component_from_name ("R'a"), + babl_component_from_name ("G'a"), + babl_component_from_name ("B'a"), + babl_component_from_name ("A"), NULL); Babl *rgbA16 = babl_format_new ( - babl_model ("R'aG'aB'aA"), - babl_type ("u16"), - babl_component ("R'a"), - babl_component ("G'a"), - babl_component ("B'a"), - babl_component ("A"), + babl_model_from_name ("R'aG'aB'aA"), + babl_type_from_name ("u16"), + babl_component_from_name ("R'a"), + babl_component_from_name ("G'a"), + babl_component_from_name ("B'a"), + babl_component_from_name ("A"), NULL); Babl *rgbA8 = babl_format_new ( - babl_model ("R'aG'aB'aA"), - babl_type ("u8"), - babl_component ("R'a"), - babl_component ("G'a"), - babl_component ("B'a"), - babl_component ("A"), + babl_model_from_name ("R'aG'aB'aA"), + babl_type_from_name ("u8"), + babl_component_from_name ("R'a"), + babl_component_from_name ("G'a"), + babl_component_from_name ("B'a"), + babl_component_from_name ("A"), NULL); Babl *rgbF = babl_format_new ( - babl_model ("R'G'B'"), - babl_type ("float"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), + babl_model_from_name ("R'G'B'"), + babl_type_from_name ("float"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), NULL); Babl *rgb16 = babl_format_new ( - babl_model ("R'G'B'"), - babl_type ("u16"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), + babl_model_from_name ("R'G'B'"), + babl_type_from_name ("u16"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), NULL); Babl *rgb8 = babl_format_new ( - babl_model ("R'G'B'"), - babl_type ("u8"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), + babl_model_from_name ("R'G'B'"), + babl_type_from_name ("u8"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), NULL); Babl *gaF = babl_format_new ( - babl_model ("Y'A"), - babl_type ("float"), - babl_component ("Y'"), - babl_component ("A"), + babl_model_from_name ("Y'A"), + babl_type_from_name ("float"), + babl_component_from_name ("Y'"), + babl_component_from_name ("A"), NULL); Babl *gAF = babl_format_new ( - babl_model ("Y'aA"), - babl_type ("float"), - babl_component ("Y'a"), - babl_component ("A"), + babl_model_from_name ("Y'aA"), + babl_type_from_name ("float"), + babl_component_from_name ("Y'a"), + babl_component_from_name ("A"), NULL); Babl *gF = babl_format_new ( - babl_model ("Y'"), - babl_type ("float"), - babl_component ("Y'"), + babl_model_from_name ("Y'"), + babl_type_from_name ("float"), + babl_component_from_name ("Y'"), NULL); Babl *ga16 = babl_format_new ( - babl_model ("Y'A"), - babl_type ("u16"), - babl_component ("Y'"), - babl_component ("A"), + babl_model_from_name ("Y'A"), + babl_type_from_name ("u16"), + babl_component_from_name ("Y'"), + babl_component_from_name ("A"), NULL); Babl *gA16 = babl_format_new ( - babl_model ("Y'aA"), - babl_type ("u16"), - babl_component ("Y'a"), - babl_component ("A"), + babl_model_from_name ("Y'aA"), + babl_type_from_name ("u16"), + babl_component_from_name ("Y'a"), + babl_component_from_name ("A"), NULL); Babl *g16 = babl_format_new ( - babl_model ("Y'"), - babl_type ("u16"), - babl_component ("Y'"), + babl_model_from_name ("Y'"), + babl_type_from_name ("u16"), + babl_component_from_name ("Y'"), NULL); Babl *ga8 = babl_format_new ( - babl_model ("Y'A"), - babl_type ("u8"), - babl_component ("Y'"), - babl_component ("A"), + babl_model_from_name ("Y'A"), + babl_type_from_name ("u8"), + babl_component_from_name ("Y'"), + babl_component_from_name ("A"), NULL); Babl *gA8 = babl_format_new ( - babl_model ("Y'aA"), - babl_type ("u8"), - babl_component ("Y'a"), - babl_component ("A"), + babl_model_from_name ("Y'aA"), + babl_type_from_name ("u8"), + babl_component_from_name ("Y'a"), + babl_component_from_name ("A"), NULL); Babl *g8 = babl_format_new ( - babl_model ("Y'"), - babl_type ("u8"), - babl_component ("Y'"), + babl_model_from_name ("Y'"), + babl_type_from_name ("u8"), + babl_component_from_name ("Y'"), NULL); Babl *yuv8 = babl_format_new ( "name", "Y'CbCr u8", - babl_model ("Y'CbCr"), - babl_type ("u8-luma"), - babl_component ("Y'"), - babl_type ("u8-chroma"), - babl_component ("Cb"), - babl_component ("Cr"), + babl_model_from_name ("Y'CbCr"), + babl_type_from_name ("u8-luma"), + babl_component_from_name ("Y'"), + babl_type_from_name ("u8-chroma"), + babl_component_from_name ("Cb"), + babl_component_from_name ("Cr"), NULL); Babl *yuvF = babl_format_new ( - babl_model ("Y'CbCr"), - babl_type ("float"), - babl_component ("Y'"), - babl_type ("float"), - babl_component ("Cb"), - babl_component ("Cr"), + babl_model_from_name ("Y'CbCr"), + babl_type_from_name ("float"), + babl_component_from_name ("Y'"), + babl_type_from_name ("float"), + babl_component_from_name ("Cb"), + babl_component_from_name ("Cr"), NULL); Babl *yuvaF = babl_format_new ( - babl_model ("Y'CbCrA"), - babl_type ("float"), - babl_component ("Y'"), - babl_type ("float"), - babl_component ("Cb"), - babl_component ("Cr"), - babl_component ("A"), + babl_model_from_name ("Y'CbCrA"), + babl_type_from_name ("float"), + babl_component_from_name ("Y'"), + babl_type_from_name ("float"), + babl_component_from_name ("Cb"), + babl_component_from_name ("Cr"), + babl_component_from_name ("A"), NULL); #define o(src, dst) \ diff --git a/extensions/gimp-8bit.c b/extensions/gimp-8bit.c index 7868cb8..15d4cc5 100644 --- a/extensions/gimp-8bit.c +++ b/extensions/gimp-8bit.c @@ -354,82 +354,82 @@ int init (void) { Babl *rgbaF_linear = babl_format_new ( - babl_model ("RGBA"), - babl_type ("float"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("float"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgba8_linear = babl_format_new ( - babl_model ("RGBA"), - babl_type ("u8"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("u8"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgba8_gamma_2_2 = babl_format_new ( - babl_model ("R'G'B'A"), - babl_type ("u8"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), - babl_component ("A"), + babl_model_from_name ("R'G'B'A"), + babl_type_from_name ("u8"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), + babl_component_from_name ("A"), NULL); Babl *rgbF_linear = babl_format_new ( - babl_model ("RGB"), - babl_type ("float"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), + babl_model_from_name ("RGB"), + babl_type_from_name ("float"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), NULL); Babl *rgb8_linear = babl_format_new ( - babl_model ("RGB"), - babl_type ("u8"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), + babl_model_from_name ("RGB"), + babl_type_from_name ("u8"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), NULL); Babl *rgb8_gamma_2_2 = babl_format_new ( - babl_model ("R'G'B'"), - babl_type ("u8"), - babl_component ("R'"), - babl_component ("G'"), - babl_component ("B'"), + babl_model_from_name ("R'G'B'"), + babl_type_from_name ("u8"), + babl_component_from_name ("R'"), + babl_component_from_name ("G'"), + babl_component_from_name ("B'"), NULL); Babl *gaF_linear = babl_format_new ( - babl_model ("YA"), - babl_type ("float"), - babl_component ("Y"), - babl_component ("A"), + babl_model_from_name ("YA"), + babl_type_from_name ("float"), + babl_component_from_name ("Y"), + babl_component_from_name ("A"), NULL); Babl *ga8_linear = babl_format_new ( - babl_model ("YA"), - babl_type ("u8"), - babl_component ("Y"), - babl_component ("A"), + babl_model_from_name ("YA"), + babl_type_from_name ("u8"), + babl_component_from_name ("Y"), + babl_component_from_name ("A"), NULL); Babl *ga8_gamma_2_2 = babl_format_new ( - babl_model ("Y'A"), - babl_type ("u8"), - babl_component ("Y'"), - babl_component ("A"), + babl_model_from_name ("Y'A"), + babl_type_from_name ("u8"), + babl_component_from_name ("Y'"), + babl_component_from_name ("A"), NULL); Babl *gF_linear = babl_format_new ( - babl_model ("Y"), - babl_type ("float"), - babl_component ("Y"), + babl_model_from_name ("Y"), + babl_type_from_name ("float"), + babl_component_from_name ("Y"), NULL); Babl *g8_linear = babl_format_new ( - babl_model ("Y"), - babl_type ("u8"), - babl_component ("Y"), + babl_model_from_name ("Y"), + babl_type_from_name ("u8"), + babl_component_from_name ("Y"), NULL); Babl *g8_gamma_2_2 = babl_format_new ( - babl_model ("Y'"), - babl_type ("u8"), - babl_component ("Y'"), + babl_model_from_name ("Y'"), + babl_type_from_name ("u8"), + babl_component_from_name ("Y'"), NULL); tables_init (); diff --git a/extensions/naive-CMYK.c b/extensions/naive-CMYK.c index 783df34..a44bbb1 100644 --- a/extensions/naive-CMYK.c +++ b/extensions/naive-CMYK.c @@ -44,34 +44,34 @@ init (void) babl_model_new ( "name", "CMYK", - babl_component ("cyan"), - babl_component ("magenta"), - babl_component ("yellow"), - babl_component ("key"), + babl_component_from_name ("cyan"), + babl_component_from_name ("magenta"), + babl_component_from_name ("yellow"), + babl_component_from_name ("key"), NULL ); babl_conversion_new ( - babl_model ("RGBA"), - babl_model ("CMYK"), + babl_model_from_name ("RGBA"), + babl_model_from_name ("CMYK"), "linear", rgba_to_cmyk, NULL ); babl_conversion_new ( - babl_model ("CMYK"), - babl_model ("RGBA"), + babl_model_from_name ("CMYK"), + babl_model_from_name ("RGBA"), "linear", cmyk_to_rgba, NULL ); babl_format_new ( "name", "CMYK float", - babl_model ("CMYK"), - babl_type ("float"), - babl_component ("cyan"), - babl_component ("yellow"), - babl_component ("magenta"), - babl_component ("key"), + babl_model_from_name ("CMYK"), + babl_type_from_name ("float"), + babl_component_from_name ("cyan"), + babl_component_from_name ("yellow"), + babl_component_from_name ("magenta"), + babl_component_from_name ("key"), NULL ); diff --git a/extensions/sse-fixups.c b/extensions/sse-fixups.c index 1866556..55de5c5 100644 --- a/extensions/sse-fixups.c +++ b/extensions/sse-fixups.c @@ -175,27 +175,27 @@ init (void) #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) Babl *rgbaF_linear = babl_format_new ( - babl_model ("RGBA"), - babl_type ("float"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("float"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgba8_linear = babl_format_new ( - babl_model ("RGBA"), - babl_type ("u8"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), - babl_component ("A"), + babl_model_from_name ("RGBA"), + babl_type_from_name ("u8"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), + babl_component_from_name ("A"), NULL); Babl *rgb8_linear = babl_format_new ( - babl_model ("RGB"), - babl_type ("u8"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), + babl_model_from_name ("RGB"), + babl_type_from_name ("u8"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), NULL); if ((babl_cpu_accel_get_support () & BABL_CPU_ACCEL_X86_MMX) && diff --git a/tests/babl-html-dump.c b/tests/babl-html-dump.c index 9d51e50..b415487 100644 --- a/tests/babl-html-dump.c +++ b/tests/babl-html-dump.c @@ -39,36 +39,36 @@ main (void) printf ("
+"); printf ("-"); printf ("
"); printf ("
Data types
\n"); - babl_type_each (each_item, NULL); + babl_type_class_for_each (each_item, NULL); printf ("
\n"); printf ("
\n"); printf ("
"); printf ("
Color models
\n"); - babl_model_each (each_item, NULL); + babl_model_class_for_each (each_item, NULL); printf ("
\n"); printf ("
\n"); printf ("
"); printf ("
Pixel formats
\n"); - babl_format_each (each_item, NULL); + babl_format_class_for_each (each_item, NULL); printf ("
\n"); printf ("
\n"); diff --git a/tests/babl_fish_path_fitness.c b/tests/babl_fish_path_fitness.c index 2f18152..f423f00 100644 --- a/tests/babl_fish_path_fitness.c +++ b/tests/babl_fish_path_fitness.c @@ -63,7 +63,7 @@ static int source_no = 0; static int source_each (Babl *babl, void *userdata) { - babl_format_each (destination_each, babl); + babl_format_class_for_each (destination_each, babl); printf ("──%2i %s\n", source_no++, babl->instance.name); return 0; } @@ -74,7 +74,7 @@ int main (void) test_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_format_each (source_each, NULL); + babl_format_class_for_each (source_each, NULL); { int i; diff --git a/tests/conversions.c b/tests/conversions.c index d5f70b6..2e05983 100644 --- a/tests/conversions.c +++ b/tests/conversions.c @@ -28,7 +28,7 @@ int main (void) babl_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_conversion_each (each_conversion, NULL); + babl_conversion_class_for_each (each_conversion, NULL); babl_destroy (); diff --git a/tests/formats.c b/tests/formats.c index 8967f03..9bf9b9d 100644 --- a/tests/formats.c +++ b/tests/formats.c @@ -18,7 +18,7 @@ int main (void) babl_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_format_each (format_check, (void *) 1); + babl_format_class_for_each (format_check, (void *) 1); babl_destroy (); diff --git a/tests/grayscale_to_rgb.c b/tests/grayscale_to_rgb.c index bf38dba..00a150b 100644 --- a/tests/grayscale_to_rgb.c +++ b/tests/grayscale_to_rgb.c @@ -37,17 +37,17 @@ test (void) fish = babl_fish ( babl_format_new ( - babl_model ("Y"), - babl_type ("float"), - babl_component ("Y"), + babl_model_from_name ("Y"), + babl_type_from_name ("float"), + babl_component_from_name ("Y"), NULL ), babl_format_new ( - babl_model ("RGB"), - babl_type ("float"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), + babl_model_from_name ("RGB"), + babl_type_from_name ("float"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), NULL ) ); diff --git a/tests/models.c b/tests/models.c index f4bef9e..f54dca7 100644 --- a/tests/models.c +++ b/tests/models.c @@ -25,7 +25,7 @@ int main (void) babl_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_model_each (model_check, NULL); + babl_model_class_for_each (model_check, NULL); babl_destroy (); diff --git a/tests/rgb_to_bgr.c b/tests/rgb_to_bgr.c index 30774f1..fd5cab5 100644 --- a/tests/rgb_to_bgr.c +++ b/tests/rgb_to_bgr.c @@ -44,19 +44,19 @@ test (void) fish = babl_fish ( babl_format_new ( - babl_model ("RGB"), - babl_type ("u8"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), + babl_model_from_name ("RGB"), + babl_type_from_name ("u8"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), NULL ), babl_format_new ( - babl_model ("RGB"), - babl_type ("u8"), - babl_component ("B"), - babl_component ("G"), - babl_component ("R"), + babl_model_from_name ("RGB"), + babl_type_from_name ("u8"), + babl_component_from_name ("B"), + babl_component_from_name ("G"), + babl_component_from_name ("R"), NULL ) ); diff --git a/tests/rgb_to_ycbcr.c b/tests/rgb_to_ycbcr.c index 9956e70..4928a6f 100644 --- a/tests/rgb_to_ycbcr.c +++ b/tests/rgb_to_ycbcr.c @@ -51,19 +51,19 @@ test (void) fish = babl_fish ( babl_format_new ( - babl_model ("RGB"), - babl_type ("float"), - babl_component ("R"), - babl_component ("G"), - babl_component ("B"), + babl_model_from_name ("RGB"), + babl_type_from_name ("float"), + babl_component_from_name ("R"), + babl_component_from_name ("G"), + babl_component_from_name ("B"), NULL ), babl_format_new ( - babl_model ("Y'CbCr"), - babl_type ("float"), - babl_component ("Y'"), - babl_component ("Cb"), - babl_component ("Cr"), + babl_model_from_name ("Y'CbCr"), + babl_type_from_name ("float"), + babl_component_from_name ("Y'"), + babl_component_from_name ("Cb"), + babl_component_from_name ("Cr"), NULL ) ); diff --git a/tests/types.c b/tests/types.c index 5463fb1..8a7551d 100644 --- a/tests/types.c +++ b/tests/types.c @@ -19,7 +19,7 @@ int main (void) babl_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_type_each (type_check, NULL); + babl_type_class_for_each (type_check, NULL); babl_destroy (); -- 2.30.2